Minor updates and fixes for RAP 2.0 and IE8 compatibility