Fix compile failure due to method signature addtion in portal-master, also refactored to have wrapper methods call private data member rather than the getWrapped() method since that follows the pattern of the portal source more closely.