[PATCH] Missed cross compile fixes