Fix persision issues.