Adding last fixs for release