Added some fixes to known bugs