WIP fixing some FIXMEs