diff --git a/plugins/LadspaEffect/calf/src/calf/buffer.h b/plugins/LadspaEffect/calf/src/calf/buffer.h
index 373fbd1cd..1e7018f3a 100644
--- a/plugins/LadspaEffect/calf/src/calf/buffer.h
+++ b/plugins/LadspaEffect/calf/src/calf/buffer.h
@@ -153,7 +153,7 @@ void copy_buf(T &dest_buf, const U &src_buf, T scale = 1, T add = 0) {
     typedef typename T::data_type data_type;
     data_type *dest = dest_buf.data();
     const data_type *src = src_buf.data();
-    int size = src.size();
+    int size = src_buf.size();
     for (int i=0; i<size; i++) 
         *dest++ = (*src++) * scale + add;
 }
diff --git a/plugins/LadspaEffect/calf/src/calf/fixed_point.h b/plugins/LadspaEffect/calf/src/calf/fixed_point.h
index 6a70a8896..44e767e4b 100644
--- a/plugins/LadspaEffect/calf/src/calf/fixed_point.h
+++ b/plugins/LadspaEffect/calf/src/calf/fixed_point.h
@@ -216,7 +216,7 @@ public:
     }
 
     template<class U, int UseBits> 
-    inline U lerp_table_lookup_int(U data[(1<<IntBits)+1]) const {
+    inline U lerp_table_lookup_int(U data[(unsigned int)(1<<IntBits)+1]) const {
         unsigned int pos = uipart();
         return lerp_by_fract_int<U, UseBits>(data[pos], data[pos+1]);
     }
@@ -224,19 +224,19 @@ public:
     /// Untested... I've started it to get a sin/cos readout for rotaryorgan, but decided to use table-less solution instead
     /// Do not assume it works, because it most probably doesn't
     template<class U, int UseBits> 
-    inline U lerp_table_lookup_int_shift(U data[(1<<IntBits)+1], unsigned int shift) {
+    inline U lerp_table_lookup_int_shift(U data[(unsigned int)(1<<IntBits)+1], unsigned int shift) {
         unsigned int pos = (uipart() + shift) & ((1 << IntBits) - 1);
         return lerp_by_fract_int<U, UseBits>(data[pos], data[pos+1]);
     }
 
     template<class U> 
-    inline U lerp_table_lookup_float(U data[(1<<IntBits)+1]) const {
+    inline U lerp_table_lookup_float(U data[(unsigned int)(1<<IntBits)+1]) const {
         unsigned int pos = uipart();
         return data[pos] + (data[pos+1]-data[pos]) * fpart_as_double();
     }
 
     template<class U> 
-    inline U lerp_table_lookup_float_mask(U data[(1<<IntBits)+1], unsigned int mask) const {
+    inline U lerp_table_lookup_float_mask(U data[(unsigned int)(1<<IntBits)+1], unsigned int mask) const {
         unsigned int pos = ui64part() & mask;
         // printf("full = %lld pos = %d + %f\n", value, pos, fpart_as_double());
         return data[pos] + (data[pos+1]-data[pos]) * fpart_as_double();