Fixed Image issues