Few tweaks to common book stuff