No-recursion fix & further bugfixing

Change-Id: Id4cfa7bdca135b7046b26bc3fe42408938fa244c