Many changes to get some scala Octi files to compile