BOOK-673, fixes