Another try at platform compatibility