diff --git a/build.rs b/build.rs
index 99cdd49..4917687 100644
--- a/build.rs
+++ b/build.rs
@@ -1,4 +1,6 @@
 #![cfg_attr(feature = "nightly", feature(i128_type))]
+#![allow(unused_variables)]
+#![allow(dead_code)]
 
 extern crate core;
 extern crate subtle;
diff --git a/src/constants.rs b/src/constants.rs
index 07a34ae..814f84e 100644
--- a/src/constants.rs
+++ b/src/constants.rs
@@ -30,7 +30,8 @@
 #![allow(non_snake_case)]
 
 use edwards::CompressedEdwardsY;
-use ristretto::{RistrettoPoint, RistrettoBasepointTable};
+use ristretto::RistrettoPoint;
+
 use montgomery::CompressedMontgomeryU;
 use scalar::Scalar;
 
@@ -88,13 +89,11 @@ pub const BASEPOINT_ORDER_MINUS_2: Scalar = Scalar([
 
 // Precomputed basepoint table is generated into a file by build.rs
 
-/*
-#[cfg(feature="precomputed_tables")]
-pub use generated::ED25519_BASEPOINT_TABLE;
-*/
 #[cfg(feature="precomputed_tables")]
 include!(concat!(env!("OUT_DIR"), "/basepoint_table.rs"));
 
+#[cfg(feature="precomputed_tables")]
+use ristretto::RistrettoBasepointTable;
 /// The Ed25519 basepoint, as a RistrettoPoint
 #[cfg(feature="precomputed_tables")]
 pub const RISTRETTO_BASEPOINT_TABLE: RistrettoBasepointTable
diff --git a/src/constants_32bit.rs b/src/constants_32bit.rs
index ab8e41d..730cce5 100644
--- a/src/constants_32bit.rs
+++ b/src/constants_32bit.rs
@@ -18,7 +18,6 @@ use field_32bit::FieldElement32;
 use scalar_32bit::Scalar32;
 use edwards::ExtendedPoint;
 use edwards::AffineNielsPoint;
-use edwards::EdwardsBasepointTable;
 
 /// Edwards `d` value, equal to `-121665/121666 mod p`.
 pub(crate) const EDWARDS_D: FieldElement32       = FieldElement32([
diff --git a/src/constants_64bit.rs b/src/constants_64bit.rs
index 2734e3c..4ef0718 100644
--- a/src/constants_64bit.rs
+++ b/src/constants_64bit.rs
@@ -18,7 +18,6 @@ use field_64bit::FieldElement64;
 use scalar_64bit::Scalar64;
 use edwards::ExtendedPoint;
 use edwards::AffineNielsPoint;
-use edwards::EdwardsBasepointTable;
 
 /// Edwards `d` value, equal to `-121665/121666 mod p`.
 pub(crate) const EDWARDS_D: FieldElement64 = FieldElement64([929955233495203, 466365720129213, 1662059464998953, 2033849074728123, 1442794654840575]);
diff --git a/src/edwards.rs b/src/edwards.rs
index 5adb792..9e68f05 100644
--- a/src/edwards.rs
+++ b/src/edwards.rs
@@ -846,7 +846,7 @@ impl<'a, 'b> Mul<&'b ExtendedPoint> for &'a Scalar {
 #[cfg(any(feature = "alloc", feature = "std"))]
 pub fn multiscalar_mult<'a, 'b, I, J>(scalars: I, points: J) -> ExtendedPoint
     where I: IntoIterator<Item = &'a Scalar>,
-            J: IntoIterator<Item = &'b ExtendedPoint>
+          J: IntoIterator<Item = &'b ExtendedPoint>
 {
     //assert_eq!(scalars.len(), points.len());