Fix FIXMEs from separating preferences window from core.