Some small tweaks to display the default image correctly