Investigated some additional failures... figured out what was wrong, but it's too hard to fix them right now, so left comments.