Linux cross fixes