Some attempted fixes