Issue#160: Added missing brackets. Minor fixes.