Fixes to browserify branch