Corrections for newest ITK (4.5)

All is in the title, has to be merged with other ITK 4.5 PRs