Fixed build issues and ensured the code was passing the latest Conformance Tests