code fixes for the issues raised by off-shore