Fix legacy methods