Primary action fixes

:thumbsup: