(#16) Fixed a couple of issues.