Doing fixes based upon Cam's comments.