minor utility fixes