Fixes to get tests passing again.