More attempted fixes