Fixing things to prepare for booklist