other fixes lost in crash