Correcting minor issues in last commit