A couple fix for a couple fails