This should fix the first error