LIB001-840: Quickfixes made