CY2008Swiss - p8p fixes