Changed several Coordinate refs to ImageCoordinate at appropriate places.