Added default returns for a couple of methods.