minor bug fixis