diff --git a/source/components/sun.markdown b/source/components/sun.markdown
index 70fb4aaa66f..5269071a927 100644
--- a/source/components/sun.markdown
+++ b/source/components/sun.markdown
@@ -39,4 +39,4 @@ sun:
 | State Attributes | Description |
 | --------- | ----------- |
 | `next_rising` | Date and time of the next sun rising
-| `nest_setting` | Date and time of the next sun setting
+| `next_setting` | Date and time of the next sun setting
diff --git a/source/getting-started/index.markdown b/source/getting-started/index.markdown
index 3ea6226848c..f8157d8255d 100644
--- a/source/getting-started/index.markdown
+++ b/source/getting-started/index.markdown
@@ -166,7 +166,7 @@ http:
 
 Home Assistant will be able to automatically discover and configure any Google Chromecasts, Belkin WeMo switches and Philips Hue bridges in your network if you have [the discovery component]({{site_root}}/components/discovery.html) enabled (which is by default).
 
-Not all devices can be discovered, so if you hae any of the following devices or services, please see their respective pages for installation instructions:
+Not all devices can be discovered, so if you have any of the following devices or services, please see their respective pages for installation instructions:
 
  * [Nest thermostat]({{site_root}}/components/thermostat.html)
  * [Wink hub]({{site_root}}/components/wink.html)