Fixes properties builder for different OSs
Fixes xml order problems