Fixed constants in tools