Fix to only build necessary things