Fixed up some defaults