more fixes, hopefully this comes to an end soon.