small runtime improvements