[probably don't want to merge these to mainline] changes for publishing