Remove some FIXMEs

Newbyterequested to merge
newbyte/i-can-fix-her into master

See individual commits

Merge request reports