Fix rapi qa

Fixes a few RAPI QA problems I've discovered in the last days.