Small changes to previous commit