Minor fixes.
deploy at commit e152ab68