Modified files to work with Linux 3.x.x