Some changed for firefox cases