Staking fixes