Fixes towards bootstrap3