Small changes to rendering