Fixed file location issues