two small fixes (very hot)