Some minor changes to previous commit