Fixed a number of hot fixes