Some fixes with less