utility fixes