Dev/minor fixes

Micro fixes for issues where other patches have been suggested