More fixes for 32bit platform