This should all be fixed now, per the discussion in scrum.