Change target platform.
Minor updates

Just cleaning some things up.
Merge remote-tracking branch 'upstream/master'