some runtime fixes