Bootstrap 3 cleanups

A few fixes for things broken by the bootstrap 3 merge.