Removed a few FIXMEs, primed for redirection remake