More coverage, small bug fix