Fixing files code (conflicts from last merge)