RPV-160 Fix for complication errors from pull request

More fixes for pull request 95