fixes for cross-browser compability
Merge pull request #1017 from TMMeilleur/bootstrap

// fixes for cross-browser compability