Small fixes to get bookish working again as standalone