Updates for 64-bit; fixes for reported bug on Ubuntu.