Added some hot fixes