Minor fixes in a few files