Fixes for image rendering and sizing