Small file tweaks