Improvements for 64bit arch