- Bug fixes for 32bit compilation