IE shenanigans remedied to some degree