Fixes for warnings appearing in 64bits mode