Fixing some problems with code navigation