Updates to work with latest Bower