Add opush role fixes #4