fixes for runtime manager to make all implementation consistent