additional fixes per jerith