Various tweaks in various files