Fixes for Firefox support