Fix ArgsSerialization and Lock to use new unified Action phases