Changes motivated by Ubuntu 14.04

Not sure how these changes will impact repos other than Ubuntu 14.04, but figured I'd submit them for review.