ENH some minor fixes pointed out by arjoly