Fix warnings
Fix default values for configured attributes
Revert fix warnings