Minor enhancements for RS