Attempt to fix lots of errors