Removed some resolved 'fixme's
Merge pull request #10 from felixmo/master

Clean up some resolved 'fixme's