Bug fixes for actions