Fixed up tools