Fix a bunch of problems...