fix cabinet bugs