Minor amendments to fix build errors

Minor amendments to fix build errors.