Some minor changes for comlilation on linux