Fixes from testing on FF, IE. #98