sigh, more fixes