More Changes to File Directory Issues