Grab bag of changes that need to be in git before working on Alex's changes for STAR