Fix IE bug and minor changes