fix some FIXMEs