Unicos portability changes