Necessary modifications to get it compiled