Release 2 : fix stuff