Fix breakage from last merge with develop