And more C fixes, I hope this is over soon.