Updates for mwc2013 self-contained environment.