Minor tweaks in the everything