ugh, more fixes