bookshelf: fixes