Some tweaks based on coverage feedback