Fixing a few minor concerns.