Fixes to get the image display to work