Fixes in few sections