jsfix
Merge branch 'fixes'