Fixes to overlay