Manual tweaks