Updated finalizers to fix the build