Fix optional callbacks so they override correctly