more fixes, I guess