[subset] Minor TODO items