Rw/deface fixes

Added some data-hooks to work with new deface overrides.