Fixes for latest sdk
Merge branch 'features/spectre_mesh' of https://github.com/donny-dont/spectre into features/spectre_mesh