Makes a few delegate method required, for playing safe.
Minor code re-ordering