BOOK-693, default amount fixes