Fixes by @snorfalorpagus in #116, keeping private vars private