Fixed the last issues.