A few more attempted fixes.