minor fixes and Makefile for 32 bit