Minor improvements

@bebraw: don't merge this yet until someone enables Travis to check if it works right.