Removed some resolved 'fixme's