Review: Various minor fixes [fix #136]