Fix bugs with Play1Siena

The restructuring broke... a lot