Fix some other stuff