Pulling in lots of fixes