Final fixes before moving to Starling version.
Starling fied