Minor embellishments

More of these minor code fixes. 

BTW, is there any convention on submitting this kind of little patches? (Are they welcome? xD)