bugfixes for bitness