Added some fixes to develop