Some more RS updates to fix display formatting