Misc overlay cleanup