Crabs: Small Fix

Few more fixes related to Cloud saving