Fix Some Bad Defaults