Couple of changes missed when putting int based image processing back.