Bug fixes & Translation updates