Bug fixes for Instant Skydive and Grinder