Github Issues with these files fixed