Some fixes to work in FF and IE