Fixes for SROA support