Some more attempted fixes :(.