Fix some more nonsense