More compiler error fixes and glib basic type swaps. Build reaches 63%.