Move from pkg_setup to src_configure + small fixes