Utility fixes