Manually edited some files so that they parse correctly.