Fixed file issues