lang: Some changes for java 1.6 compatible build