usage patter fixes