Updates to get tests passing.