Fixes for bootstrap 3