Fixes to support Alloy 1.0GA and TiSDK 3.0.2