Bugfix and cleanup in riftrenderpass