Extra fixes for errors occuring