Minor fixes in files