Updated some defaults