Fixed FF 19 issues