Minor changes to allow proper jumping and switching