Update due to CORE mutex API changes
Update due to chain API changes
Update due to shell API changes