More minor tweaks to help screen lumps