X mode is now persisted for runbuild so no need to set it explicitly
Passing arguments to xbuild with "" to escape them correctly