Light navigation fixes.