Fixes in intslation