Wriggle bug fixes