pre-merge fixes with anirrudh