Uncomment some commented parts