Main branche fixes