Resolve more FIXMEs.