Fixes to default upload permission calculations.