overlay bug fixes