Change return types.  Somehow this didn't get checked in yesterday