more minor fixes (issue #27)