Squashing some bugs.