A couple of misc fixes, plus fix the varargs load handling code