FIX some refactor hardening in previous commits