Linux build fix, architecture fix