Fixed issues found in jshero