Fixed file:* functions