#169 Nit fixes.