#6 tiny improvments on plugin render