A few more rwd commits