more hot fixes to get images working