Fix drawing and location reporting.