This commit fixes the followings