Fixing more actions