Fix all issues