Fix to a couple of files