Fixes for nav