Minor changes before the RTL version