clay mode command fixes