Minor fixes

will merge this straightaway, as it isn't affecting the bundle's
behaviour.