Various fix of interface managment