Fix some silly things