Minor tweaks.

@AmbientOSX @BrettASwift @ajiraffe @eric79