Fixing return values.