Added some issues fix