build/upload fixes