more cross compile fixes