some minor fixes (as seen on comments for prev commit)