More autonomous tweaks