2 more fixes, i think?