Minor changes to previous commit