Bugfix on some defaults