<fix> minor bug fixes