Further fixes. I think we're good for now!