Escape Rebooted: Bug fixes

Small bug fixes