Small fixes related to navigation