Fix up main build script for new working server