Various fixes for booklook.