Fixed issues with running on Firefox