Some changes to get VxWorks wrapper working