Minor tweaks in files