- Fixed few critical issues