Trying to squash some bugs