Cleanups and coverage improvements