BUGFIX: Fixed rpt violations
BUGFIX: Fixed rpt violations
BUGFIX: Fixed rpt violations
BUGFIX: Fixed rpt violations
BUGFIX: Fixed rpt violations
BUGFIX: Fixed rpt violations
BUGFIX: Fixed rpt violations
BUGFIX: Fixed rpt violations
BUGFIX: Fixed rpt violations
Merge pull request #676 from benjamij/rpt-fixes

Rpt fixes