Misc fixes
Some more position fixes. unbreaks 2.0 mode in nbruby