Release 3.0 - Fix inconsistent function return values