R4: Fix a show-stopper and a visual bug