Fixing top-level build