gamble fixes
more gamble fixes