Fixes for RWD