Update for SevenCommons, fix buildscript