clear up some Action bugs