fixes on lang