Fixed some overlay bugs