Fix some single screen + sound stuff