Some fixes before submission