Introduced fixmes where revision is required

Fixing them, we would end with #11