Fix a few of those REETODOs