hopefully patch up the ugly and get a build to complete.