LIB001-898: Quick fixes
Merge pull request #209 from ianthe/LIB001-898

LIB001-898: Quick fixes