Fix all issues this time