Minor tweaks
Added a check of the interface