minor bug fixws