Bower fixes

Fixes for issues #28 + #29