File uploads sorted out