further fixes for 32 bit machines