Hopefully fix build failure and set defaults
Set default