Some fixes with comma