These FIXMEs were fixed prolly before they were merged ;)

Change-Id: Ibc598dbce723df1c209e9e46ff5d20b34ab0ad34