BOOK-773, fixes