Fixed some issues with image import