more runtime fixes