LIB001-898: Quick fixes