Small fixes
Clean configure options (and associated preproc macro)