Minor fixes to performance and ux