Little fixes
Merge branch 'working' of https://github.com/logicking/UltimateJS.git into working