Fix even more silly bugs!