Minor tweaks to wiggle hack