Fix comments Jco pointed out