Fixed various @FIXMEs.