Fixed actions not calling EndXXX.