Minor fixes to f4429ad