Linux mods from Al's version