Various Fixes

So far just 2.

these are #232 & #234.

Both may be a result of recent changes as part of this version, so nothing in the change log for them :)