Modifications from Staging Server to resolve issues noticed while testing.