Navigation & build fixes