Fix language + misc