Fixes on lang