= Fix a couple of TODOs