Updated files to make it compile.