Changed FIXMEs to TODOs where applicable