Minor fixes with lead class