gambit.h fixes, take 2