A couple fixes to get squiggle working properly