inor fixes