more fixes (dunno why these didn't work the first time)