More Boostrap 2 -> 3 upgrades.

Fixes #528, #508
Can you say more about the 2 deltas in this file?