some fixes; before interface rewrite