Fixed first issues.