Changes to support cslinux