Fix Imaging Bugs