More AIS Overlay improvements and fixes.