Resolved file issues