Path updates and merge to the latest ka-lite code.