Minor fixes for datetime and navigation