fix FIXMEs (#4)