diff --git a/src/decaf.rs b/src/decaf.rs
index db12cde..99fe115 100644
--- a/src/decaf.rs
+++ b/src/decaf.rs
@@ -253,7 +253,7 @@ impl BasepointMult<Scalar> for DecafPoint {
     // XXX is this actually in the image of the isogeny,
     // or do we need a different basepoint?
     fn basepoint() -> DecafPoint {
-        DecafPoint(constants::BASEPOINT)
+        DecafPoint(ExtendedPoint::basepoint())
     }
 
     fn basepoint_mult(scalar: &Scalar) -> DecafPoint {
@@ -322,7 +322,7 @@ mod test {
         // Check that bp_recaf differs from bp by a point of order 4
         let diff = &ExtendedPoint::basepoint() - &bp_recaf;
         let diff4 = diff.mult_by_pow_2(4);
-        assert_eq!(diff4.compress_edwards(), ExtendedPoint::identity().compress_edwards());
+        assert_eq!(diff4.compress_edwards(), CompressedEdwardsY::identity());
     }
 
     #[test]