Fixed a couple more gotchas