Fix Component and Bower support