Fix action callbacks