BUGFIX: Fixed RPT validation errors
BUGFIX: Fixed RPT validation errors
BUGFIX: Fixed RPT validation errors
Merge pull request #668 from benjamij/rpt-fixes

Rpt fixes