Squash a couple bugs