fixed compatability issues after last merge