fixes for runtime issues