Fix a bunch of broken image conversion/scaling issues