Fix some channel remove channelmanager consistency bugs