Even more fixes

Topics 2, 3, 4 & 5