Some refactorings to make actions and processes more compatible