A couple of TODO items