Fixing a couple of minor problems...