Few pending (minor) engine refactoring changes