Fixing a couple minor issues?