#862 Alternative interface
#912 Fix some interface doubles