fix runtime issues
2 files changed