A LOT of fixes