Unhide some handling code