Small changes to save error