Fix just a few things