Fixes a couple of issues.