Interface changes, bug fixes