Update some bits and pieces