Extensions related fixes for M37.

SSIA