Removed 2 FIXMEs