FIXMEs and typos