Small defaults changes