navigation fixes and fc fixes