Three quick fixes!

# Changes
Fixes three easy issues. See commits.

/cc @angaither