Updates for latest reflection changes.