A lot of fixes in the previous "A lot of fixes" commit :)