Fixing a couple of minor issues.