Changes and cleanups in relation /w 32-bit/64-bit