Bugfixes
32 bit version