Fix some more lang related