fix: cross-runtime consistency fixes (#179)

fix: cross-runtime consistency fixes (#179) #398