Upload: Fixes for FF