Fix a couple of TODO items