fixup! Small changes from testing.