Fixes to diagnostic service performance, navigation