Few minor changes to get Radarsat2 data to work. More clean up.