Fix mutation error + some other erors