Self_Action fixes