Add a couple FIXMEs