A couple of small bug fixes.