Fix dropped import dependencies