Fixes to measure coverage