[TIMOB-16052] More bug fixes.
[TIMOB-16052] More bug fixes.

salem/titanium,titanium-forks/appcelerator.titanium,cheekiatng/titanium,cheekiatng/titanium,titanium-forks/appcelerator.titanium,FokkeZB/titanium,salem/titanium,FokkeZB/titanium,titanium-forks/appcelerator.titanium,salem/titanium,FokkeZB/titanium,cheekiatng/titanium