WIP: Fix the FIXMEs