Slew of warning fixes in diffimage