Hopefully fix all the files