Minor fixes on defaults management.