Fix some nonsense