Fix import breakage