Cleanups and fixes from the electrolytic separator update