Issues fixed found in Integration test