Several fixes made to SituationAwareness-related code during yesterday's
tests.