Attempt to squash a few bugs