SR build errors fixed