Fixes for EMEN2 2.2.9 and 2012 retreat.