Corrected errors found during integration tests

Change-Id: I9c65bfdaf40c79481651e8423a2d11f56e557ee3