Small fixes to recent changes.