Forgot to remove a few "FIXMEs"