Minor changes to rendering