Adjusting some stuffs for preparing release