Onmap Flag and Sign fixes