Added some fixes to do