Fix all issues (Aug 23)