Removed some FIXMEs/bugs