Update buildsys and adjust