Apply minor tweaks