Fix firefox issues