Fix enum warning in ICP project
Fix enum warnings in Navaids project