minor fixes for i386 linux build