GPII-1018: Fixing errors after review.