Minor RWD improvements, pushing out for work on other machine