small cleanups to bring in line with what will be master