Finalizers fixed