Fix methods returning None