Updates for QA Testing

This PR comprises some cleanup and needed changes for the QA 3.4 testing.