More fixes to Opportunity