Tweaks, fixes to image mounting.