Fix bugs with Play1Siena

The restructuring broke... a lot
Merge pull request #1191 from TechEmpower/fixPlay1Siena

Fix bugs with Play1Siena