Fixes and now release ready !