Captain CoinCoin: Fixes

Light updates for some fixes