Minor bugs fixes
Multi-Language Fixes