Fixes to get nav data to run stable