Fixed defaults so that things do not break