Some small updates to rendering