Fixed some issues with overlay not matching

Main code rev. 1917