Fixing compile errors aagainst latest lidalia-lang