Fixed rwd bugs.