More changes to accomodate ITKv4