Fixing a few nits

(Might be worth adding some harmless commits just to kick travis.)