Fixing up some small issues.