Changed defunct functions to safe_prototype