Fixed NPM and Bower issues