base fixes to be wlink buildable on 64-bit, but it is still not working properly