Fixes for IE and Firefox