Minor fixes for FireFox and IE