Fixing some pretty obvious bugs.