some minor fixes to previous commit
(sf.net r416)