Misc fixes to pl.lang