Further tweaks for automagicks