Small fixes to 1ca3a62.
Small fixes to ac819c6.