Various fixes to guides