fixed all errors reported by integration tests