added missing lang() calls and fixed flash builder warnings

Change-Id: I44c9d4b075591c9868076b03ea4292ff5b2662bc