Fixme pass

A few niggling FIXMEs removed