KRACOEUS-7109 : Code review changes and oracle sql fixes