Minor fixes in configuration and default guarding