small changes so code will work without --enable-flint