Fix some wonkiness