Temporarily ignore these errors. Will do a full review of diff before pull request