Some relaease fixes