General fixes and resyning with portage