Minor updates of interface