Fix legacy imports