Some fixes
Interface changes