rwd fixes