Changed some default behaviour