Coverage improvements straight onto the master, boohya