Latest fixes from SEASAT branch