cancel commands bug fixes