Firefox and Mac fixes