Some additional tweaks from the bootstrap3 code work