Fixes for base upload that is different dimension