Minor changes to some method return values