fix 2 small bug