Fixed a couple of problems.