Some fixes for default values.