diff --git a/src/array.c b/src/array.c
index 046da45..8e50236 100644
--- a/src/array.c
+++ b/src/array.c
@@ -28,7 +28,7 @@ static void* _ar_memory_get(struct array* this, long i)
 	return &this->data[i*this->element];
 }
 
-static const void _ar_memory_set(struct array* this, long i, const void* item)
+static void _ar_memory_set(struct array* this, long i, const void* item)
 {
 	if(i<0 || i>= this->size) return;
 
diff --git a/src/xoroshiro.c b/src/xoroshiro.c
index a2237e2..0eb2601 100644
--- a/src/xoroshiro.c
+++ b/src/xoroshiro.c
@@ -77,7 +77,7 @@ void _seed(const void* from)
 
 double _sample() 
 {
-	return (next() & ((1L << 53) - 1)) * (1.00 / (1L << 53));
+	return (next() & ((INT64_C(1) << 53) - 1)) * (1.00 / (INT64_C(1) << 53));
 }
 
 RNG_IMPL_DEFINITION(xoroshiro128plus)