Fixes for firefox
Fix merges
bug fixes