Minor fixes and amends