Removing more FIXMEs