Fix some lang issues