The FIXMES are fixed now.