various attempted fixes