Action framework tweaks