Fixes for #95, #244 and #243

Couple of quick fixes to sneak into this release :)