Fixed some bugs in Action