Fixed file path bugs