Fix decorations applying to wrong components of safe.