Minor fixes to improve performance and appearance