Fix issues in FF, Safari