more r? fixes