fix navigation etc. for 3.1