lots of fixes due to action machinery rewrite