Fixes for presentation to POIG 1.4 2012