Fixed squirrely bugs.