* Small interface fixes;