Default changes and bugfix