Fixed a couple bugs with composite actions and changed hash factories