Fixes to Imaging