fix key, machine associations