Small touches to fix