2 small bug fixes