fix some bugs due to the changes made for spring social