More fixes to IMAGERY