small fixes (no functional code change)