Fix more memory mapping issues