RWD fixes