Fix finalizers