Fix more issue with overlay type