A few optimizations, waiting for navigation code