Improvements to various components