small fixes (from master)