Had to tweak some scripts to fix navigation active statuses