fix even more fixmes