Fixes for sticky and magellan nav