A _lot_ of fixes