Hopefully fixed test build under XC5