Some more tweaks to make sure he doesn't fall out of the wirer