Updated former dangerous defaults to use a more proper/error free implementation.