Compile fixes in navigator
Dataman: Optimize for space
Navigator: Optimize for space