Issues with files created on latest S4S build