Corrects some minor issues
using theirs