Fixes a couple of small issues.