even more fixes?!?