Corrected bugs found during unit and integration testing

No match.