Fixing minor issues in previous commit