Fixing overlay problems