Changes to ContentControl helpers