avgroc and instroc fixes