Minor cleanup for Bower support