Fixed several minor bugs that were immersion breaking.