Fix lots of issues...