Fixing some minor defects.