Fixing build failures on clean repo and new Siddhi API