fixes for grevents refactor, works with actions