Added Linux port changes