Fix manage keys