Small changes to accommodate minimal version