more fixes for opro