Updated bunch of files to minimize compiler errors.