Fixes and amends