Additional fixes for Refactoring of saplings code