Further refinement of the multiplatform handling