Add in some defaults