Started fixing return objects on PC.