Little fixes to get tests passing again.