Fixed some action functionalities