Fix some warnings (and bugs).
Fix some warnings (and bugs).

shlomif/black-hole-solitaire,shlomif/black-hole-solitaire,shlomif/black-hole-solitaire,shlomif/black-hole-solitaire,shlomif/black-hole-solitaire,shlomif/black-hole-solitaire