Fix JNA issues