More fixes in followings pages