fix a few issues after massive cherry-pick updates