More FIXMEs and bug stomping