Fixed some issues in Firefox