Some fixes for gravityfall