More Boostrap 2 -> 3 upgrades.
Fixes #528, #508