Fixed overlay issues