diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 4a9f50c..d9004a1 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -4,42 +4,41 @@
 FROM ubuntu:bionic
 
 # install some basic packages
-RUN apt-get update \
-	&& apt-get install -y --no-install-recommends \
-	build-essential \
-	curl \
-	git \
-	python3-dev \
-	python3-pip \
-	cmake \
-	ca-certificates \
-	libssl-dev \
-	pkg-config \
-	gcc \
-	g++ \
-	clang-8 \
-	clang-tools-8 \
-	llvm-8 \
-	llvm-8-dev \
-	libc++-dev \
-	libc++abi-dev \
-	lld-8 \
-	lldb-8 \
-	libclang-8-dev \
-	libclang-common-8-dev \
-	vim \
-	apache2 \
-	subversion \
-	libapache2-mod-svn \
-	libsvn-dev \
-	binutils-dev \
-	build-essential \
-	automake \
-	libtool \
-	strace \
-	less \
-	libuv1-dev \
-	&& rm -rf /var/lib/apt/lists/*
+RUN apt-get update
+RUN apt-get install -y --no-install-recommends \
+  build-essential \
+  curl \
+  git \
+  python3-dev \
+  python3-pip \
+  cmake \
+  ca-certificates \
+  libssl-dev \
+  pkg-config \
+  gcc \
+  g++ \
+  clang-8 \
+  clang-tools-8 \
+  llvm-8 \
+  llvm-8-dev \
+  libc++-dev \
+  libc++abi-dev \
+  lld-8 \
+  lldb-8 \
+  libclang-8-dev \
+  libclang-common-8-dev \
+  vim \
+  apache2 \
+  subversion \
+  libapache2-mod-svn \
+  libsvn-dev \
+  binutils-dev \
+  build-essential \
+  automake \
+  libtool \
+  strace \
+  less
+RUN rm -rf /var/lib/apt/lists/*
 
 # set to use our installed clang version
 RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-8 100
@@ -48,8 +47,7 @@ RUN update-alternatives --install /usr/bin/llvm-config llvm-config /usr/bin/llvm
 # set LD_LIBRARY_PATH
 ENV LD_LIBRARY_PATH=/usr/local/lib
 
-RUN curl https://sh.rustup.rs -sSf | \
-	sh -s -- --default-toolchain stable -y
+RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain stable -y
 ENV PATH=/root/.cargo/bin:$PATH
 
 RUN rustup component add rustfmt
diff --git a/Dockerfile.x86_64 b/Dockerfile.x86_64
index addbf96..4901a23 100644
--- a/Dockerfile.x86_64
+++ b/Dockerfile.x86_64
@@ -4,42 +4,41 @@
 FROM ubuntu:bionic
 
 # install some basic packages
-RUN apt-get update \
-	&& apt-get install -y --no-install-recommends \
-	build-essential \
-	curl \
-	git \
-	python3-dev \
-	python3-pip \
-	cmake \
-	ca-certificates \
-	libssl-dev \
-	pkg-config \
-	gcc \
-	g++ \
-	clang-8 \
-	clang-tools-8 \
-	llvm-8 \
-	llvm-8-dev \
-	libc++-dev \
-	libc++abi-dev \
-	lld-8 \
-	lldb-8 \
-	libclang-8-dev \
-	libclang-common-8-dev \
-	vim \
-	apache2 \
-	subversion \
-	libapache2-mod-svn \
-	libsvn-dev \
-	binutils-dev \
-	build-essential \
-	automake \
-	libtool \
-	strace \
-	less \
-	libuv1-dev \
-	&& rm -rf /var/lib/apt/lists/*
+RUN apt-get update
+RUN apt-get install -y --no-install-recommends \
+  build-essential \
+  curl \
+  git \
+  python3-dev \
+  python3-pip \
+  cmake \
+  ca-certificates \
+  libssl-dev \
+  pkg-config \
+  gcc \
+  g++ \
+  clang-8 \
+  clang-tools-8 \
+  llvm-8 \
+  llvm-8-dev \
+  libc++-dev \
+  libc++abi-dev \
+  lld-8 \
+  lldb-8 \
+  libclang-8-dev \
+  libclang-common-8-dev \
+  vim \
+  apache2 \
+  subversion \
+  libapache2-mod-svn \
+  libsvn-dev \
+  binutils-dev \
+  build-essential \
+  automake \
+  libtool \
+  strace \
+  less
+RUN rm -rf /var/lib/apt/lists/*
 
 # set to use our installed clang version
 RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-8 100
@@ -48,8 +47,7 @@ RUN update-alternatives --install /usr/bin/llvm-config llvm-config /usr/bin/llvm
 # set LD_LIBRARY_PATH
 ENV LD_LIBRARY_PATH=/usr/local/lib
 
-RUN curl https://sh.rustup.rs -sSf | \
-	sh -s -- --default-toolchain stable -y
+RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain stable -y
 ENV PATH=/root/.cargo/bin:$PATH
 
 RUN rustup component add rustfmt
@@ -57,8 +55,7 @@ RUN rustup target add wasm32-wasi
 
 RUN cargo install --debug cargo-audit cargo-watch rsign2
 
-RUN curl -sS -L -O https://github.com/CraneStation/wasi-sdk/releases/download/wasi-sdk-7/wasi-sdk_7.0_amd64.deb \
-	&& dpkg -i wasi-sdk_7.0_amd64.deb && rm -f wasi-sdk_7.0_amd64.deb
+RUN curl -sS -L -O https://github.com/CraneStation/wasi-sdk/releases/download/wasi-sdk-7/wasi-sdk_7.0_amd64.deb && dpkg -i wasi-sdk_7.0_amd64.deb && rm -f wasi-sdk_7.0_amd64.deb
 
 ENV WASI_SDK=/opt/wasi-sdk
 ENV PATH=/opt/sledge/bin:$PATH
diff --git a/runtime/Makefile b/runtime/Makefile
index af3bcaf..29e7ea3 100644
--- a/runtime/Makefile
+++ b/runtime/Makefile
@@ -89,7 +89,7 @@ all: clean runtime
 runtime:
 	@echo "Compiling runtime"
 	@mkdir -p bin/
-	@${CC} ${CC_OPTIONS} ${INCLUDES} ${CFLAGS} ${LDFLAGS} ${CFILES} ${JSMNCFLAGS} -L/usr/lib/ -luv $^ -o bin/${BINARY_NAME}
+	@${CC} ${CC_OPTIONS} ${INCLUDES} ${CFLAGS} ${LDFLAGS} ${CFILES} ${JSMNCFLAGS} -L/usr/lib/ $^ -o bin/${BINARY_NAME}
 
 thirdparty:
 	@echo "Compiling thirdparty"